CHANGELOG merge=union
